From c235747847d59db7f2bf553cc53f7656397b7627 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 20 Jan 2015 17:48:54 +0100 Subject: [PATCH] GtkFileChooserWidget: remove unused fields and cleanup code. These fields are never set, so we don't need the code to clean them up. https://bugzilla.gnome.org/show_bug.cgi?id=725164 --- gtk/gtkfilechooserwidget.c | 39 -------------------------------------- 1 file changed, 39 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index c6bd8ddbd3..100d43ca85 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -254,14 +254,10 @@ struct _GtkFileChooserWidgetPrivate { LocationMode location_mode; /* Handles */ - GSList *loading_shortcuts; - GSList *reload_icon_cancellables; GCancellable *file_list_drag_data_received_cancellable; GCancellable *update_current_folder_cancellable; GCancellable *should_respond_get_info_cancellable; GCancellable *file_exists_get_info_cancellable; - GCancellable *update_from_entry_cancellable; - GCancellable *shortcuts_activate_iter_cancellable; LoadState load_state; ReloadState reload_state; @@ -2782,32 +2778,9 @@ static void cancel_all_operations (GtkFileChooserWidget *impl) { GtkFileChooserWidgetPrivate *priv = impl->priv; - GSList *l; pending_select_files_free (impl); - if (priv->reload_icon_cancellables) - { - for (l = priv->reload_icon_cancellables; l; l = l->next) - { - GCancellable *cancellable = G_CANCELLABLE (l->data); - g_cancellable_cancel (cancellable); - } - g_slist_free (priv->reload_icon_cancellables); - priv->reload_icon_cancellables = NULL; - } - - if (priv->loading_shortcuts) - { - for (l = priv->loading_shortcuts; l; l = l->next) - { - GCancellable *cancellable = G_CANCELLABLE (l->data); - g_cancellable_cancel (cancellable); - } - g_slist_free (priv->loading_shortcuts); - priv->loading_shortcuts = NULL; - } - if (priv->file_list_drag_data_received_cancellable) { g_cancellable_cancel (priv->file_list_drag_data_received_cancellable); @@ -2832,18 +2805,6 @@ cancel_all_operations (GtkFileChooserWidget *impl) priv->file_exists_get_info_cancellable = NULL; } - if (priv->update_from_entry_cancellable) - { - g_cancellable_cancel (priv->update_from_entry_cancellable); - priv->update_from_entry_cancellable = NULL; - } - - if (priv->shortcuts_activate_iter_cancellable) - { - g_cancellable_cancel (priv->shortcuts_activate_iter_cancellable); - priv->shortcuts_activate_iter_cancellable = NULL; - } - search_stop_searching (impl, TRUE); recent_stop_loading (impl); } -- 2.30.2